Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Sep 2011 14:14:31 +0000 (07:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 11 Sep 2011 14:14:31 +0000 (07:14 -0700)
commit349fa31b221b26338c4808f25265bcc5e995faf8
tree019a485ef7604a5e8608750042c5058f32608483
parente6687869f706d746acc0a307b1d355e2c34c10d7
parent659d00d58f1c9bae6b3114b472d261bf571bde6e
Merge from trunk.